I found some awesome furniture from a company called Legare Legare Desks and Office, Computer, Media and Kids Furniture and I'm going through a supplier that's giving me a pretty big discount. Shits easy to put together and take apart if you move.
Here is what my new layout will be and it allows space for 1 or 2 more people to sit and work in the office if need be. My office is bigger then the work area below but the pic just shows my actual work area in the office.
[ame=http://www.youtube.com/watch?v=BRXfWTHtccE]YouTube - Legare corner desk assembly by Brock[/ame]
Here is what my new layout will be and it allows space for 1 or 2 more people to sit and work in the office if need be. My office is bigger then the work area below but the pic just shows my actual work area in the office.

[ame=http://www.youtube.com/watch?v=BRXfWTHtccE]YouTube - Legare corner desk assembly by Brock[/ame]