Revision 2.0

- Fixed bug with teleport target
- Updated Layout