More layout work
Implementing flight.js